From b7d2b7c190634e512fa72816bb92e979dfbbe70f Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Wed, 19 Aug 2009 11:58:02 +0000
Subject: [PATCH] * don't wrap video player container if already in DOM

---
 js2/mwEmbed/libEmbedVideo/embedVideo.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index 622b720706..4cf29bd8f9 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -350,7 +350,7 @@ var ctrlBuilder = {
        	$tp.find('.k-options').click(function(){      
        		if($j('#' + embedObj.id + ' .k-menu').length == 0 )
        			addMvOptions();
-       			 					
+       		//set up the text and menu:       			 					
        		var $ktxt = $j(this).find('.ui-icon-k-menu');
        		var $kmenu = $tp.find('.k-menu');
 			if( $kmenu.is(':visible') ){
@@ -639,8 +639,8 @@ mvEmbed = {
 				}
 			}
 			//string -> boolean:
-			if(embed_video[method]=="false")embed_video[method]=false;
-			if(embed_video[method]=="true")embed_video[method]=true;
+			if( embed_video[method] == "false") embed_video[method] = false;
+			if( embed_video[method] == "true") embed_video[method] = true;
 		}
 		///js_log('did vI style');
 		//now swap out the video element for the embed_video obj:
@@ -1757,8 +1757,10 @@ embedVideo.prototype = {
 			html_code += this.getControlsHTML();
 			html_code +='</div>';
 			//block out some space by encapulating the top level div
-			$j(this).wrap('<div style="width:'+parseInt(this.width)+'px;height:'
+			if($j(this).parents('.k-player').length==0){
+				$j(this).wrap('<div style="width:'+parseInt(this.width)+'px;height:'
 					+ (parseInt(this.height) + ctrlBuilder.height )+'px" id="k-player_' + this.id + '" class="k-player ui-widget"></div>');
+			}
 		}
 
 		//js_log('should set: '+this.id);
-- 
2.20.1